From 2fc1ae81344ec4bd58b5a505c11c444bec363077 Mon Sep 17 00:00:00 2001 From: Xan Lopez Date: Wed, 27 Jun 2007 17:41:19 +0000 Subject: [PATCH] Do not add border_width to the first button initial coordinate, since it's 2007-06-27 Xan Lopez * gtk/gtkvbbox.c (gtk_vbutton_box_size_allocate): * gtk/gtkhbbox.c (gtk_hbutton_box_size_allocate): Do not add border_width to the first button initial coordinate, since it's already taken into account in the allocation value. (#451484) svn path=/trunk/; revision=18261 --- ChangeLog | 9 +++++++++ gtk/gtkhbbox.c | 3 +-- gtk/gtkvbbox.c | 3 +-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 25005c7079..45a317e45d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2007-06-27 Xan Lopez + + * gtk/gtkvbbox.c (gtk_vbutton_box_size_allocate): + * gtk/gtkhbbox.c (gtk_hbutton_box_size_allocate): + + Do not add border_width to the first button initial + coordinate, since it's already taken into account in + the allocation value. (#451484) + 2007-06-27 Michael Natterer Merged from maemo-gtk: diff --git a/gtk/gtkhbbox.c b/gtk/gtkhbbox.c index 399ae19c04..45ef1582bd 100644 --- a/gtk/gtkhbbox.c +++ b/gtk/gtkhbbox.c @@ -242,8 +242,7 @@ gtk_hbutton_box_size_allocate (GtkWidget *widget, (allocation->width - (child_width * (nvis_children - n_secondaries) + spacing * (nvis_children - n_secondaries - 1)))/2 - + (n_secondaries * child_width + n_secondaries * spacing)/2 - + GTK_CONTAINER (box)->border_width; + + (n_secondaries * child_width + n_secondaries * spacing)/2; secondary_x = allocation->x + GTK_CONTAINER (box)->border_width; break; default: diff --git a/gtk/gtkvbbox.c b/gtk/gtkvbbox.c index c7b7256807..bbd6e9e530 100644 --- a/gtk/gtkvbbox.c +++ b/gtk/gtkvbbox.c @@ -246,8 +246,7 @@ gtk_vbutton_box_size_allocate (GtkWidget *widget, (allocation->height - (child_height * (nvis_children - n_secondaries) + spacing * (nvis_children - n_secondaries - 1)))/2 - + (n_secondaries * child_height + n_secondaries * spacing)/2 - + GTK_CONTAINER (box)->border_width; + + (n_secondaries * child_height + n_secondaries * spacing)/2; secondary_y = allocation->y + GTK_CONTAINER (box)->border_width; break; default: -- 2.30.2